From: Julien Grall Date: Mon, 10 Feb 2014 17:34:46 +0000 (+0000) Subject: xen/arm: Correctly boot with an initrd and no linux command line X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5587 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=3b2f92c1f8567461562fac9922fbad223dc8c6cf;p=xen.git xen/arm: Correctly boot with an initrd and no linux command line When DOM0 device tree is building, the properties for initrd will only be added if there is a linux command line. This will result to a panic later: (XEN) *** LOADING DOMAIN 0 *** (XEN) Populate P2M 0x20000000->0x40000000 (1:1 mapping for dom0) (XEN) Loading kernel from boot module 2 (XEN) Loading zImage from 0000000001000000 to 0000000027c00000-0000000027eafb48 (XEN) Loading dom0 initrd from 0000000002000000 to 0x0000000028200000-0x0000000028c00000 (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Cannot fix up "linux,initrd-start" property (XEN) **************************************** (XEN) Signed-off-by: Julien Grall Acked-by: Ian Campbell --- diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 47b781b420..5ca2f154cf 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -209,12 +209,15 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, return res; } - if ( dt_node_path_is_equal(node, "/chosen") && bootargs ) + if ( dt_node_path_is_equal(node, "/chosen") ) { - res = fdt_property(kinfo->fdt, "bootargs", bootargs, - strlen(bootargs) + 1); - if ( res ) - return res; + if ( bootargs ) + { + res = fdt_property(kinfo->fdt, "bootargs", bootargs, + strlen(bootargs) + 1); + if ( res ) + return res; + } /* * If the bootloader provides an initrd, we must create a placeholder